Skip to content

chore: sync main from pingdotgg/t3code - #97

Merged
D3SOX merged 308 commits into
mainfrom
upstream-sync
Nov 22, 2026
Merged

D3SOX merged 308 commits into
mainfrom
upstream-sync

Conversation

@D3SOX

@D3SOX D3SOX commented Nov 21, 2026

Copy link
Copy Markdown
Owner

Sync pingdotgg/t3code:main into main.

Merge with a merge commit to preserve fork changes and shared upstream history.

juliusmarminge and others added 30 commits November 20, 2026 18:27
…tgg#37274)

Co-authored-by: Grok 4.7 <noreply@x.ai>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
pingdotgg#32989)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ick or when it opens (pingdotgg#39319)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
… worktrees (pingdotgg#35721)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ngdotgg#29261)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…dotgg#31432)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…nd median (pingdotgg#39660)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…efault (pingdotgg#39981)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
… app does (pingdotgg#28597)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…rogress (pingdotgg#37859)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
juliusmarminge and others added 27 commits November 22, 2026 01:08
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…its destination (pingdotgg#40739)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…g#40767)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…#40783)

Co-authored-by: geezoria <25051260+geezoria@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ation (pingdotgg#33916)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…#40781)

Co-authored-by: Abhiram-745 <237478249+Abhiram-745@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: shadowfeind <travestroy007@gmail.com>
…ingdotgg#36802)

Co-authored-by: Alex Southwell <4596216+saphid@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
…tgg#40778)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
# Conflicts:
#	apps/mobile/src/components/ComposerToolbar.tsx
#	apps/mobile/src/components/ui/AndroidScreenHeader.android.tsx
#	apps/mobile/src/components/ui/IconButton.android.tsx
#	apps/mobile/src/components/ui/IconButton.types.ts
#	apps/mobile/src/components/ui/SearchField.tsx
#	apps/mobile/src/components/ui/WorkspaceAppBar.android.tsx
#	apps/mobile/src/features/threads/ThreadFeed.tsx
#	apps/mobile/src/features/threads/threadListV2.test.ts
#	apps/mobile/src/i18n/translations/de.json
#	apps/mobile/src/i18n/translations/en.json
#	apps/mobile/src/i18n/translations/es.json
#	apps/mobile/src/i18n/translations/fr.json
#	apps/mobile/src/i18n/translations/ja.json
#	apps/mobile/src/i18n/translations/ko.json
#	apps/mobile/src/i18n/translations/pt-BR.json
#	apps/mobile/src/i18n/translations/ru.json
#	apps/mobile/src/i18n/translations/sv.json
#	apps/mobile/src/i18n/translations/zh.json
#	apps/mobile/src/state/use-thread-composer-state.ts
#	apps/server/src/cloud/bootService.test.ts
#	apps/server/src/cloud/bootService.ts
#	apps/server/src/orchestration-v2/PullRequestWatchReactor.ts
#	apps/server/src/orchestration-v2/RunExecutionService.ts
#	apps/server/src/orchestration-v2/ThreadSettlementService.ts
#	apps/server/src/provider/agentContextBudget.json
#	apps/server/src/storageCleanup.test.ts
#	apps/server/src/storageCleanup.ts
#	apps/web/package.json
#	apps/web/src/components/ChatMarkdown.tsx
#	apps/web/src/components/ChatView.tsx
#	apps/web/src/components/Sidebar.logic.test.ts
#	apps/web/src/components/Sidebar.tsx
#	apps/web/src/components/chat/ChatComposer.tsx
#	apps/web/src/components/chat/ComposerFooterControls.tsx
#	apps/web/src/components/chat/ComposerPrimaryActions.tsx
#	apps/web/src/components/chat/MessagesTimeline.browser.test.tsx
#	apps/web/src/components/chat/QueuedRunsControl.tsx
#	apps/web/src/components/chat/TimelineAssistantRows.tsx
#	apps/web/src/components/chat/TimelineUserMessageRow.tsx
#	apps/web/src/components/chat/TimelineWorkEntryRow.tsx
#	apps/web/src/components/chat/composerCommandKey.ts
#	apps/web/src/components/chat/useComposerSend.ts
#	apps/web/src/components/sidebar/SidebarDraftBlock.browser.test.tsx
#	apps/web/src/components/sidebar/SidebarDraftBlock.tsx
#	apps/web/src/components/sidebar/SidebarThreadRow.tsx
#	apps/web/src/i18n/translations/de.json
#	apps/web/src/i18n/translations/en.json
#	apps/web/src/i18n/translations/es.json
#	apps/web/src/i18n/translations/fr.json
#	apps/web/src/i18n/translations/ja.json
#	apps/web/src/i18n/translations/ko.json
#	apps/web/src/i18n/translations/pt-BR.json
#	apps/web/src/i18n/translations/ru.json
#	apps/web/src/i18n/translations/sv.json
#	apps/web/src/i18n/translations/zh.json
#	docs/user/composer.md
#	packages/client-runtime/src/operations/commands.test.ts
#	packages/client-runtime/src/operations/commands.ts
#	packages/client-runtime/src/state/threadWorkflows.ts
#	packages/contracts/src/clientRpcPermissions.ts
#	packages/provider-core/src/server/runtimeInstructions.test.ts
#	packages/provider-core/src/server/runtimeInstructions.ts
#	pnpm-lock.yaml
#	pnpm-workspace.yaml
…reloads them mid-run (pingdotgg#31999)

Co-authored-by: Rodrigo Brechard <rodrigo@clubtidy.fr>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ills (pingdotgg#40808)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…us (pingdotgg#31295)

Co-authored-by: Justin <159104807+Justin24506@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@D3SOX

D3SOX commented Nov 22, 2026

Copy link
Copy Markdown
Owner Author

Note

🤖 Claude Opus 5.5 responding on behalf of Nico

Merges upstream through 379a98a plus 13 later commits into the fork, keeping the fork's features.

Notable resolutions:

  • Sidebar rows: upstream shows the environment instead of the branch (#40736). The fork's "Show thread branches" setting still shows the branch and falls back to the environment label.
  • Storage cleanup: keeps the fork's branch-change rules (readBranch), upstream's task folders (checkouts must keep their branch), and upstream's later full-status check.
  • Boot service: the fork's restart-intent file wraps upstream's stopForRestart/handOffRestart. The intent is also cleared when a queued handoff is interrupted.
  • Queue: keeps the fork's reorder and after-next-tool timing alongside upstream's slash-command rules. Slash commands never take after-next-tool timing: it is not set on dispatch, timing changes, or an edit into a command, and the timing button is hidden. Saving an edit into a command no longer leaves the queue paused for editing.
  • Mobile Steer adopts #40572: it no longer maps to auto.
  • Thread settlement keeps the fork's rule that any pending background task holds auto-settle.

Proof: contracts, client-runtime, provider-core, server, web and mobile typecheck pass, and the i18n check passes. Focused tests pass: storageCleanup, bootService, AgentContextBudget, PullRequestWatchReactor, RunExecutionService, ThreadSettlementService, runtimeLayer, SteeringCompletion, commands, threadWorkflows, followUpBehavior, threadListV2, plus the Sidebar, SidebarDraftBlock and MessagesTimeline browser tests.

Reviewed with sol-loop: 4 rounds with gpt-6.2-sol on high.
Sol verdict: approved

@D3SOX
D3SOX merged commit 8898dba into main Nov 22, 2026
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

vouch:trusted Author is trusted by repo permissions or the VOUCHED list.

Projects

None yet

Development

Successfully merging this pull request may close these issues.